From: Florian Müllner Date: Sun, 8 Jun 2014 19:18:49 +0000 (+0200) Subject: panelMenu: Clean up code a bit X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~2431 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=589becbc79c7a96144298d75b3abd37f6dc97ccf;p=gnome-shell.git panelMenu: Clean up code a bit --- diff --git a/js/ui/panelMenu.js b/js/ui/panelMenu.js index 9bb1f1bc4..07494d181 100644 --- a/js/ui/panelMenu.js +++ b/js/ui/panelMenu.js @@ -41,8 +41,7 @@ const ButtonBox = new Lang.Class({ }, _getPreferredWidth: function(actor, forHeight, alloc) { - let children = actor.get_children(); - let child = children.length > 0 ? children[0] : null; + let child = actor.get_first_child(); if (child) { [alloc.min_size, alloc.natural_size] = child.get_preferred_width(-1); @@ -55,8 +54,7 @@ const ButtonBox = new Lang.Class({ }, _getPreferredHeight: function(actor, forWidth, alloc) { - let children = actor.get_children(); - let child = children.length > 0 ? children[0] : null; + let child = actor.get_first_child(); if (child) { [alloc.min_size, alloc.natural_size] = child.get_preferred_height(-1); @@ -66,13 +64,11 @@ const ButtonBox = new Lang.Class({ }, _allocate: function(actor, box, flags) { - let children = actor.get_children(); - if (children.length == 0) + let child = actor.get_first_child(); + if (!child) return; - let child = children[0]; let [minWidth, natWidth] = child.get_preferred_width(-1); - let [minHeight, natHeight] = child.get_preferred_height(-1); let availWidth = box.x2 - box.x1; let availHeight = box.y2 - box.y1;